Remove scraggling conflict marker.
authorrobertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Wed, 19 Nov 2008 04:23:53 +0000 (04:23 +0000)
committerrobertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Wed, 19 Nov 2008 04:23:53 +0000 (04:23 +0000)
commiteb273b222b62e2ccc086594e9bca92a9e1542b2a
tree5baae0626b27a47571b6db6fe8137d9714816b9e
parent64b5060a05575bf23a9bfa99618d46a87939fc28
Remove scraggling conflict marker.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@3605 f51c46e8-681c-474f-0cfe-069cfd0219fb
gpsbabel/testo